API: Check return value from $gitInfo->getHeadCommitDate()
authorBrad Jorsch <bjorsch@wikimedia.org>
Mon, 5 May 2014 14:23:30 +0000 (10:23 -0400)
committerBrad Jorsch <bjorsch@wikimedia.org>
Mon, 5 May 2014 14:23:30 +0000 (10:23 -0400)
action=query&meta=siteinfo&siprop=extensions calls
$gitInfo->getHeadCommitDate() to attempt to find the commit date, but
does not check whether that function returned false before using the
value. This resulted in displaying the current date for "vcs-date" when
the function failed.

Bug: 64821
Change-Id: Ic39a74abe5160b3b7fbfb7c15323328d6b317560

includes/api/ApiQuerySiteinfo.php

index b7796ee..b0e9bd2 100644 (file)
@@ -567,7 +567,10 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                                                $ret['vcs-system'] = 'git';
                                                $ret['vcs-version'] = $vcsVersion;
                                                $ret['vcs-url'] = $gitInfo->getHeadViewUrl();
-                                               $ret['vcs-date'] = wfTimestamp( TS_ISO_8601, $gitInfo->getHeadCommitDate() );
+                                               $vcsDate = $gitInfo->getHeadCommitDate();
+                                               if ( $vcsDate !== false ) {
+                                                       $ret['vcs-date'] = wfTimestamp( TS_ISO_8601, $vcsDate );
+                                               }
                                        } else {
                                                $svnInfo = SpecialVersion::getSvnInfo( $extensionPath );
                                                if ( $svnInfo !== false ) {